From: Ximin Luo <infinity0@debian.org>
Date: Tue, 25 Jul 2017 12:59:11 +0000 (+0200)
Subject: Ignore a failing test and add support for "nocheck"
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~181
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=daa5acaa8c943a8c535b8218315d569224136aa3;p=cargo.git

Ignore a failing test and add support for "nocheck"
---

diff --git a/debian/patches/disable-net-tests.patch b/debian/patches/disable-net-tests.patch
index f69e646f8..a2a0497f0 100644
--- a/debian/patches/disable-net-tests.patch
+++ b/debian/patches/disable-net-tests.patch
@@ -23,6 +23,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  fn https_something_happens() {
      let server = TcpListener::bind("127.0.0.1:0").unwrap();
      let addr = server.local_addr().unwrap();
+@@ -177,7 +177,7 @@
+ }
+ 
+ // Boy, sure would be nice to have an SSH implementation in rust!
+-#[test]
++//#[test]
+ fn ssh_something_happens() {
+     let server = TcpListener::bind("127.0.0.1:0").unwrap();
+     let addr = server.local_addr().unwrap();
 --- a/tests/net-config.rs
 +++ b/tests/net-config.rs
 @@ -4,7 +4,7 @@
diff --git a/debian/rules b/debian/rules
index 167c903bb..73d69b246 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,11 @@ ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
 endif
 
 override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_PROFILES)))
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	CFG_DISABLE_CROSS_TESTS=1 $(CARGO) test $(CARGOFLAGS)
+endif
+endif
 
 override_dh_auto_install:
 	# We pick stuff directly from target/